Updated to latest revision 7304. More, better, faster.