Add some logic operators - finally working :)