Dev/rewrite the hooks for the vwf