updated and integrated most of the slides