some last modifications for simulation demo