jayarrarr recommended a rework of this 6 years ago

Based on events which I hope do not occur.

1