Added solutions for 3.7