Refactor 3.25
Answer 3.26