Everything For issue_24