Account for changes to solve