Code changes as per post-mtg-101514-feedback-R2: part 2