jamwt/bus 4 commits