added more simulation stuff