Updated stuff to use latest simulation