reverted last commit and changed variable names