Updating based on Michael's comments