Added simulation capabilities