Add normalize back in