added flag for logical supervision
merge conflict