Issue #10 change sort