upd many new changes 2