Added more variables place