edited handling