final changes after tutorial