More work on modify_entry method....much much more functional...