Add working simulated mode