Added Normalize and modernize