Now stable; do not want the -r1 yet