Hot: restructure