refactored to separate the helpers. working on users