Yah, these if/then switches for using the new system hopefully won't be around for long :)