added switch_statements that should display