Should fix ignore bugs. +Refactoring