Updated cursor functionality