Adding in more data storage to make display easier