modifications from master