Update final solution (dojo1)