Final changes for HH field mapping review