Slide set (first version) and minor changes to code (refactoring)