squash! Working commit 36