upd ver, refac