storing now goes into the correct order
correctly writing names of various data sources