Updated vars and comments