re-committing changes made some time ago for conditionalVariable
updated conditionVariable calls
Merge branch 'working'