More code pulled out to [dads].