squeeze a few more changes