Updated to normalize 3.0.1 and customized it