pulling together mine with master