Wout: changed variable names