before I change sort
commented everything