Merging Tutorial with new Design