add solution for 1.8