add helpers since they were removed in merge