Updated for v7.7