added angle calculation, only dry tested.