some major modificationfor dataset