Improved disarm