adding ignore
some refactorings