Better way to do the cursor