some vars renamed