Updated for v1.5