removed threading for now
merge