Update to account for recent changes