additions and changes after watching solution