Replaced cursors with updated version