Ranged Adaptation/Refactored