Stability improvements
stability