integrating from master