Updated normalize