XXX: PC<->pi version