Another crazy hot patch, this one slightly more thought out than the one before it