added if else and case