Removed more duplication