Add solution for Q5