Reworked an older piece because it was pissing me off (again).