Added conditionals for simulator