OH ARCHITECTURE - MAINS RE-EDIT