started expand changes in solve-single