adding missing changes
Merge branch 'research'