Getting my wires crossed between a few pull requests where I changed how that was implemented in them. I will update these.