Changed Make to allow for threads