Working implementation
Updated ignore list