Revert, tune and update