Added variables, removed repeat