J.A. Happ picks up right where he left off in return from DL