Simplified the public data set