minor clean-up
modified simulation for LCM
merge conflict