Used SJ, Removed Dead Code for Angle Adjust