Added more variables for testing/presenting