Upd and HW changes