Move some code around
Add code written during presentation