safety commit

have not synced changes in months.