updated for B4