Updated to latest code base from other PICs