added NOT, SYSTEM support