Changed Buffer-switching behaviour so that it changes between networks as well as...