renamed variables once again