Totally revamping, changing location gathering from activity to service