replay improvements