More changes: run the right func