calderon timeline fix