Incorporating Alex's comments