very important method implemented
merge master into team_1