Added cursors. Fixed initial waiting status for self