renamed more variables