Changes before end of class