safety commit

progress