Separated patch from update logic

- Update now correctly replaces; patch selectively updates