Changed PreProcessor to become more streamlined in terms of the simulator