Updating based on feedback from Jorge