Updated for 1.3.1