created simple switching method
fix merge issue