modified Edit Stuff