copied RPV things over