Simplified EQUAL and NOT_EQUAL code and addiion of individual EQUAL/NOT_EQUAL