squash! Working commit 38