few changes
Commit to move to other computer.
merged conflicts