Solution to problem 2, done?