Add solution for 04/07