additional changes for replication