local changes ole
merge
added differentiated cursors