some updates to replay and testing of replay