Else if conditional added