Changes for SimSuite8