Suggested changes from Kane, deleting some unnecessary things and work to pass in collections.