Complete revision 243104.