Some mods to phc-intel #2