presentation changes
Horray, conflicts
Laast changes to presentation