Now does implicit integration with switches