Implement hotness on shoe
Fix conflicts