+javadocs
Small update Simulation