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