Updated for Add Location