Got rid of BCD functions