Added switchcase