some changes after watching the solution video