new ignore files and imporoved logic