quick fiddle with code but reverted so here's a new release anyway