Modified simulator to admit more input