Complete rewrite with a focus on stability