still not fixed sorting but closer