linking up with tim
merging with tim