edit almost done