Added coordinate tracking