updated for b32.1