Made more changes to rupgrade