FINAL (hopefully) change to bus layout.