Update from other projects
Merge hammer and chute