Beta updates (23/24)

Beta updates