fixed if/elif switch up