additional changes to replication setup