Everything For issue_39