Trying to make sirs work with newer machinery.