Nov 12

Final changes before passing to Mike