updating mentor copy
code refactoring