Second part of B2 now working