changed signatures for case --disable-replication