removed duplicate checks from elsewhere.