Refacoting to add ignore list
merge