More faffing with edit mode