Added simulation feature