updated for 2.6.2-ALPHA1