Made setup more robust
Tweaked more robust setup