Local changes to build the gate