removed andor3 as it was badly cloned