Add user visible changes from Michael Shields from