changed design [TS-1]