lovely re-write but cannot use it because of other deps