code cleanup, timestamp changed (still not working properly)
merge
merge, timestamp mean