Changes for b6