major fix in h2w and a start for d2w