modified  bug
Merge branch 'refactored'