Sorting Fix + truth schema stuff please verify