Modified ns-3.21