added tid and timestamp
os specific merged