improve simulator module