added selection, edit