still fixing sort