Safe bus (21/23)

Safe bus