Added replicas
Merged changes