Reverted to use offset angle