updated server (not working yet)