final changes
merge angle
changes in the code review