redid some of the angle stuff