This logic is now in the main editor method, included.