new branch
Revert "new branch"

This reverts commit 9c6e5b84c479738afb279269c935281277541383.
conversion of functions to booleans