snif and flatten changed