Everything For issue_25