upd index and all