removed more duplication