Updated code & VPUML as on 26-May-13