Do not the 'system' switch anymore