Added Cursor and Main