matched changes from minimized version