Additional progress on server