Modified this to make it more like the one I built from scratch so I can compare them directly.