Removed sorting for now