Made List Gathering more clear, added more state checks