Update normalize and add option to not use a reset