Boolean changes
Revert "Boolean changes"

This reverts commit 181fa6efb720635e218796749a065af5eaef3652.
Boolean and correction of constructor