working on the angular portion