Re-arrange transition from angle to angle-double