revise callActiivity and location