Goodman steps up at the right time