Added more variables