Removed angles and stuff