added solutions for 1.18