Cleaned up problem 15