Fixing Kazu's mistakes... --David Caratelli