added some methodes to the simulate class
Fixed merge conflict