Slightly updated push server code