[squash] take into account the suggestions so far