Buff Bus system changes

by CU Independent