fixed variable names... again...