minor changes to get_timestamps