Added more variables.