Use better fn names.
Renumber all slides.