1.6.0 add old solution