added vars and normalize