squash! Working commit 25