Enhancement to implement Disarm Hack