added changes to the data creation stage