updated datatable and some other sintaxe changes