Improve safety