continued work on server