Working on server side functionality
minor modifications on client side