small changes to clent side