Removed one call to googleapi - should improve resonsiveness