updated server functionality
comment on line 174