squash and fix while at it