Changes form julian master