rewrite cursor
check & update models