Add more simulation stuff