Include util, document, improve simulation