changed initialize to global variable.
Merge branch 'master' into Amy_Jason
Merge branch 'Amy_Jason'
unificating stuff