more robust editing