added location info. not currently working though.