Massive Changes to Code--part 1 revised