Updating based on feedback from Tavish