added timestamp and increased throughput
merged and resetted with local version