FIX: Address Alex's comments