Working version of simple upgrade