changed name of file and change simulator TODO