Adding George's Mac extension code.