Reduced amount of total changes in the code