Refactored buses 1
Refactored buses 2