Updated code & VPUML