I refactored to account specifically for AD.