JF Hap edits 2