small switch improvement