Added tasks 24, 25 temp solutions