code review, rewrite at bus