Refactor to match example, troubleshoot install issue.