Better ordering and updated dates