Up to problem 6
fix