added new client funcionality, needs debugging