1.17 Hannah Update