Added logic for debug of location info