reworked a bit Tazim-s PR
Added a check system list