Caution management work in progress