begin work on threading fix