Added back in the new ttf code