[MERGE] merged functions with client