Complete rewrite (stability - unstable)