More Robust Setup