Changes to use squash
Squash is cool