major changes, add some states