Updated to reflect changes on Client