squash! Working commit 6