Update to b5 and b6