modified var names
finish simulator