some work on server...