Updated for Release 1.2.8