New interface and toggling without tests.