Update Changes for PR#12