Updated for v1.8.2