updated server and client classes