Changes from Nick email - Part 2