Revert "final changes after tutorial"

This reverts commit dab749b9a220651983536cf187ec099a1bd5166c.
final changes after tutorial