Updated for CDH4.2.1