Major stability improvements