Updated to REV E - Headless