Added performance switch