Ed3

After merging Chase's code.