Changes for stuart's comments