Modify to Use propper dataset