Boolean detection is now fully working