renamed date_marker -> timestamp