Updated for recent changes