Applied Huey Improvements to unbreakable version

Oops, I forgot!