[master] imporve solor