update

Last round left code unstable. This new round will probably do the
same.