added some things for NS2 @sengjea