very important method implemented
code refactor
Merge branch 'master' into team_2