Updated plan, added mainmap