Modifications on tutorial