improving Tutorial to solve all problems