more changes in server.py