Everything For issue_96