This also looks like the same fixture as before, although i didn't look that carefully.  Refactor to a single location if you can.