upd and added popup