Merge and nice + tom for sol1