Today
merge from Halloween_25_Update (network++)