Address Alex's comments