Added software mode back in (let's see if it works!)