change setup methods to return the list