Added a few more variables