Updated for 3.8.2