Added OR and AND compiling. Forgot about them