Everything For issue_7