removed dataTable, included working track flow
fixed conflicts