Added changes to client + input class