Added active switch