updated in prep for 12.1.2