bug fixes replicater
merge