hp module edits
merging