Rearranged and updated client works