+ added more variables.