Made changes to how the client works