Gerry's stuff
Updating for decay over time.