Finished adding sorting