More code written for rupgrade script