improved editsituation