XVX-Project2&3 N1 pull&request

XVX-Project2&3 N1 pull&request