more rubust setup
more rubust setup