rethinking some variable names