Changes before upgrade