updated some variable names