Modified toggle wrapper