Edit and other changes