branching the Anton code into the 1.2.1 version, duh! =]