Subject: add current_location

Description: