Refactored targeting.