safety commit. still having weird issues, but at this point it is not something fun