updated from latest video