Changes that make it work on the presentation