reverting to best integration of changes