Added more appropriate cursors.