[safehaven] updates