changed storage order