[safehaven] more updates