server side working
minor changes