Rewrite normalize stuff in the base component