refactoring done(?) Client doesn't wanna get added, didn't check if it was any different originally.
refactoring even more done