Final. Complete tutorial changes