Trying to improve the data streams