Altered some variable names