Updated with GetLocation API - BUILD WORKING