Refactored the client code to be more efficient,
as well as the model calls
missed one part of refactor