restored to what I had a few days ago, with timestamping and stuff