refactored to use same degree measurement