Refactored gate parking