Added arm/disarm switch