added etcd back into the mix