Timestamp and code optimalize

Timestamp and code optimalize