Changed the data storage to three separate vectors