Added simplistic timestamp saving
Simplistic timestamp saving