second edit, for feedback