Added more data but need to fix memory issue