To replay2

@giffels

Manuel, please review the pull request. Merge it if no errors.

Thanks,
Yuyi