added functionalities at client