Redid the gatekeeper and moved things