changes 1
through general concepts
full pass