Update

New comparison on timestamp et token (check if != null).