addressed one part of the Cursor issue