Edit and new items
Merged