ready to move to development
refactored feature
fixed merge conflicts