moving over from roshan's hg; hope this works