problem 21 and 23. rename class for problem 1 and 4.