Removed Repeat, few changes in edit mode