Changed stoplist to something more similar to what the current system uses