Rearranged the methods in Client