squashed last 25 commits