Just before updating the code to manage timestamps