merging with Alexis/Datatable