PROBLEM 12 fixed with performance