Add name space and change name of simulation funcion