Implemented current locatiuon handling