working angle. to see what need to be done see last commit