changing arming logic to not deal with queues