On Calzada's rehab and return