Added angle detection (buggy)