fixed id issue, timestamps