adjust variable names.. again!