Upgraded to CDH4.6