Fixed problem 2 so it works fine now