undoes date hack; adds date ordering