restored a few beam5 features unintentionally excluded