Refining location workflow a bit