Safe bus (17/23)

Safe bus