Buttons and detectors now separated