safety commit before some drastic stuff