Update and rename BD(21) to BD(22)