squashed last 30 commits