disarm here instead of sep web call. TODO: REFACTOR ALL OF THIS