swithing tyy implemented, rename