Timestamping + bugfix