updating for 1.2.7 CVS :)