d08bb4d Added cursors. Fixed initial waiting status for self