Updated for latest spec iteration