change to new solution