modified edit_option