Added the disarming code