Updated to latest p-u and p-int