Changed variables, fixed passers