Everything For issue_40