implement new mechanism for smooth transition from DEVICE to CLIENT