Separate out new html and old html (so sample and sample-new both work)