Added angle duplication check, need to update