[safehave] updates