Updated for 1.9.2cvs