revert back to original changes and added Location