Issue 36 - Adding function back, will integrate to final bool query
soon.