Attempt to minimize the changes in the existing code