Tweaked server gate - still not right :(