Hot: rework