Feature #101 - added switching feature