More normalization
0.1.1