Match updated server.py