Replay: Update and improvement