Changes for saving and for change of data structure to array

Code review : Cyrus Venn Casada