Updated using util.c functions for degrees and radians