Added D2 for requirements
Fixed s2 problems
Corrected minor errors in the simulation