refactor to work now when called instead of coding in a list