#150 revise requirements check