removed threading from master