Planning for changes and better intagrator