Improvments on tutorial