added some conditionals and variables for testing