Updates by Rick's comments