updated with new fileds and ordered desc