Incorporating more changes - D.Kilby