Stabilise what we have

> Note: this is a bit negative?