New ignore and some refactoring