squashed last 40 commits