renamed variables, additional classes