Introduced some threading