Added solutions to template