Take into account modifications