Added angle checking