further adaptations for Beam 5