Added simulation stuff