merged last two versions of slides