Modified solutions -- 1.7, 1.8 to be added