Cleaned up problem 25