Updated if else elsif statements