Updated based on editor feedback