edit almost finished