FIX #3 added currentl location as text