added vars, will change names