Weight system and sorting added.