minor adjustments in parameters switching