Switches in corridor and others things