Added more variables for testing