Added Compass and removed Mainframes