updated for CDH 5.1