Adding switch - use the corelation terms