Fixed Edit Function