Pull in barsoom changes