bug fix  + more flexibility on simulations