Updated for B5 and B6