squash! Working commit 37