refactored to remove duplicate code
refactored for scope
increment version number