now with cursor tracking