Added interrupt and trigger versions, renamed programs