Simulator model update changed
fixed merging conflict