Again, minimizing differences between this and geodyamics/master