squash! Working commit 30