Updated with our dataset format
Better output format