added thinking...
Merge branch 'thinking'