Upgraded versions for CDH4