Added bools and special-form if