end of night tuesday
reordering indexing fixed