Latest changes for debugging the faulty timeline