Add package
Put back normalize