Added last-clicked location keeping