more simulation stuff
merge