First Refactoring :p
Add ignore