broken commit. Refactoring according to changes in client class design