Updated for 3.12.13