changed more strict