[1.16C] Re-work design insta-closing