New names to variables
Minor changes
Simulation is now approx working. Added a non-zero function
asd