Update to work with SDI