Added one more location.
Quick refactoring on the PR