Added hardware-free option