Changed thinking time to be constant
Merge branch 'andreifin-master'
header changes