change to 21 base