Need to work with no ignores too