FIX: Addressing Alex's comments