Finishing David's latest changes (there were some errors in it).