Moved switch to utilities.py