Advinc rebase3

Another rebase.