server and client modifications connected with location