squash with fixes