Ypvs undergoing a few changes. Rebuild