Merged. Edit and replace functionality present