Cdh4 consumer

changes as per Mark's comment