Couple of changes, nothing major, reusing more code in the server and modify should work now