added squish (mostly)