Updated for 3.1.3