squash! Working commit 22