Modifications to make server work