added solution + second exercise