get rid of two shape variables, fix degrees to radians