First real commit with "and" and "or"