all done, but there is some bugs on validation data