Added more variables

Added more variables.