Added some more variables