Fix solution for 04/02
Fix solution for 04/03
Add solution for 04/04