Additions to HCP Q3 patch