Changed order of commands in server.